* insdel.c (Fcombine_after_change_execute): Return nil if

combine_after_change_buffer has been invalidated.

diff --git a/src/ChangeLog b/src/ChangeLog
index 75119c1bef1cd795b76ce5d1b5b6d99841df58b1..b2b2bf22360d7feba717cb04c49744905a8accca 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+       * insdel.c (Fcombine_after_change_execute): Return nil if
+       combine_after_change_buffer has been invalidated.
+
 2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * m/xtensa.h: New file.